From bf6b3ca7aeed9faadbd4afd98ac99fcb69adfcb9 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Wed, 8 Jan 2025 10:55:47 +0100 Subject: [PATCH] fix apps menu not closing when the window is hidden, and make group folders menu work again this change resolves this ReferenceError when the window is being closed: ``` 2025-01-08 10:56:40:389 [ warning default qrc:/qml/src/gui/tray/MainWindow.qml:100 ]: qrc:/qml/src/gui/tray/MainWindow.qml:100: ReferenceError: appsMenu is not defined ``` I also noticed that the "Open local or group folders" dropdown menu wouldn't show up due to this error: ``` 2025-01-08 10:56:23:327 [ warning default qrc:/qml/src/gui/tray/TrayFoldersMenuButton.qml:33 ]: qrc:/qml/src/gui/tray/TrayFoldersMenuButton.qml:33: Error: Cannot call method QQuickPopup::open on QQuickLoader_QML_48(0x5569fb4648d0) ``` --> wrapped the calls to the open/close methods in a closure Signed-off-by: Jyrki Gadinger --- src/gui/tray/MainWindow.qml | 4 ++-- src/gui/tray/TrayFoldersMenuButton.qml | 4 ++-- src/gui/tray/TrayWindowHeader.qml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml index 482f65ea8..a16b351ae 100644 --- a/src/gui/tray/MainWindow.qml +++ b/src/gui/tray/MainWindow.qml @@ -100,8 +100,8 @@ ApplicationWindow { if (Systray.isOpen) { trayWindowHeader.currentAccountHeaderButton.accountMenu.close(); - appsMenu.close(); - openLocalFolderButton.closeMenu() + trayWindowHeader.appsMenu.close(); + trayWindowHeader.openLocalFolderButton.closeMenu() } } diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml index 6da6f9ca9..f98cad514 100644 --- a/src/gui/tray/TrayFoldersMenuButton.qml +++ b/src/gui/tray/TrayFoldersMenuButton.qml @@ -222,8 +222,8 @@ HeaderButton { } Component.onCompleted: { - foldersMenuLoader.openMenu = open - foldersMenuLoader.closeMenu = close + foldersMenuLoader.openMenu = function() { open() } + foldersMenuLoader.closeMenu = function() { close() } } Connections { diff --git a/src/gui/tray/TrayWindowHeader.qml b/src/gui/tray/TrayWindowHeader.qml index 10080212c..9ba808e5b 100644 --- a/src/gui/tray/TrayWindowHeader.qml +++ b/src/gui/tray/TrayWindowHeader.qml @@ -26,6 +26,8 @@ Rectangle { id: root readonly property alias currentAccountHeaderButton: currentAccountHeaderButton + readonly property alias openLocalFolderButton: openLocalFolderButton + readonly property alias appsMenu: appsMenu color: Style.currentUserHeaderColor -- 2.30.2